必填

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -728,7 +728,7 @@
               <el-form-item prop="num">
                 <el-input-number
                   v-model="item.F_Number"
-                  :min="1"
+                  :min="0"
                   size="medium"
                 />
               </el-form-item>
@@ -831,7 +831,7 @@
               <el-form-item prop="num">
                 <el-input-number
                   v-model="item.F_Number"
-                  :min="1"
+                  :min="0"
                   size="medium"
                 />
               </el-form-item>
@@ -1614,7 +1614,7 @@ export default {
     addItem() {
       const params = {
         F_DicId: "",
-        F_Number: 1,
+        F_Number: 0,
         F_ReceiveUser: "",
       };
       this.dispatchhaocaiarrError.push(params);
@@ -1622,7 +1622,7 @@ export default {
     addItemEdit(){
       const params = {
         F_DicId: "",
-        F_Number: 1,
+        F_Number: 0,
         F_ReceiveUser: "",
       };
       this.dispatchhaocaiarrEdit.push(params);

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -1304,7 +1304,7 @@ export default {
       // }
     },
     submitForm() {
-      // console.log(this.devList)
+      // console.log(this.typeAlias)
       // return;
       if (this.orderTypeData.type2Arr.length == 0 && !this.wid) {
         this.$message.error("请选择工单类别");
@@ -1329,7 +1329,7 @@ export default {
       ) {
         const index = this.devList.findIndex((o) => {
           return !o.F_IsBorrow || !o.devname || !o.num;
-        });       
+        });
         if (index >= 0) {
           this.$message.error("请选择对应物资信息");
           return;
@@ -1344,7 +1344,20 @@ export default {
         const index = this.devList.findIndex((o) => {
           return !o.F_ToDept || !o.devname || !o.num;
         });
+        if (index >= 0) {
+          this.$message.error("请选择对应物资信息");
+          return;
+        }
 
+        // if (this.devList.length > 0 && !this.devList[0].F_ToDept) {
+        //   this.$message.error("请选择对应物资信息");
+        //   return;
+        // }
+      }
+      if (this.typeAlias === "2006") {
+        const index = this.devList.findIndex((o) => {
+          return !o.devname || !o.num;
+        });
         if (index >= 0) {
           this.$message.error("请选择对应物资信息");
           return;

CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/addComDispatch/addComDispatch.vue

@@ -28,7 +28,7 @@
 				</uni-forms-item>
 				<view style="margin: 15px 0;" v-show="valiFormData.WorkOrderCategory && flag[flaginfo]">
 					<view style="margin-bottom: 15px;">
-						<text class="infoTittle"><text v-show="flaginfo==='2001' || flaginfo==='2003'|| flaginfo==='127548'|| flaginfo==='10617' || flaginfo==='JC'|| flaginfo==='FJ' || flaginfo==='2007'" style="color: red;">*</text>{{flagName[flaginfo]}}</text>
+						<text class="infoTittle"><text v-show="flaginfo==='2001' || flaginfo==='2003'|| flaginfo==='127548'|| flaginfo==='10617' || flaginfo==='9129'|| flaginfo==='9130' || flaginfo==='2007'" style="color: red;">*</text>{{flagName[flaginfo]}}</text>
 						<uni-icons type="plus" size="30" color="#007aff" @click="plusClck()"></uni-icons>
 						<uni-icons type="minus" size="30" color="#007aff" @click="minusClck()"></uni-icons>
 					</view>
@@ -168,7 +168,7 @@
 				typeid: 0,
 				candidates: [],
 				// 标本信息（BBXX），设备信息（SBXX），物资信息（WZXX），病床信息（BCXX），药品信息（YPXX）
-				flagid: ["2001","2002","2003","2006","2005","9129","9130",'2007',"127548","10617"],
+				flagid: ["2001","2002","2003","2006","2005","9014","9129","9130",'2007',"127548","10617"],
 				flaginfo: '',
 				fileLists: [],
 				flag: {
@@ -177,6 +177,7 @@
 					"2002": 'WZXX',
 					"2003": 'BCXX', 
 					"2005": 'YPXX',
+					"9014": 'YPXX',
 					"9129": 'BBXX',
 					"9130": 'BBXX',
 					"2007": 'XYLX',
@@ -189,6 +190,7 @@
 					"2003": '病床信息',
 					"2006": '标本信息',
 					"2005": '药品信息',
+					"9014": '药品信息',
 					"9129": '标本信息',
 					"9130": '标本信息',
 					"2007": '送达科室',
@@ -522,6 +524,19 @@
 					// 	return
 					// }
 				}
+				if(this.identification === 'JC'||this.identification === 'FJ'){
+					const index = this.dicList.findIndex((o) => {
+					  return !o.F_DicName || !o.F_Number;
+					});
+					if (index >= 0) {
+					  this.$mHelper.toast('请选择对应物资信息')
+					  return;
+					}
+					// if(this.dicList.length > 0 && !this.dicList[0].F_ToDept){
+					// 	this.$mHelper.toast('请选择对应物资信息')
+					// 	return
+					// }
+				}
 				if(this.dicList.length == 0 || (this.dicList.length>0 && !this.dicList[0].F_DicName)){
 					this.dicList = null
 				}