Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/views/business/carrier/formCategory.vue

@@ -26,6 +26,16 @@
         <el-form-item label="类别名称" prop="name">
           <el-input v-model.trim="form.name" placeholder="类别名称" />
         </el-form-item>
+        <el-form-item label="检查箱子" prop="status">
+          <el-select v-model="form.isInspection">
+            <el-option
+              v-for="item in is_allow_more"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item
           label="是否多批"
           prop="status"
@@ -147,6 +157,6 @@ function validateParentId(rule, value, callback) {
 
 /** 暴露给父组件的方法 */
 defineExpose({
-  open
+  open,
 });
 </script>

src/views/business/carrier/multipleForm.vue

@@ -30,6 +30,26 @@
         <el-form-item label="结束箱码" prop="remark">
           <el-input v-model.trim="form.endCode" placeholder="结束箱码" />
         </el-form-item>
+        <el-form-item label="检查箱子" prop="status">
+          <el-select v-model="form.isInspection">
+            <el-option
+              v-for="item in is_allow_more"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否多批" prop="status">
+          <el-select v-model="form.isAllowMore">
+            <el-option
+              v-for="item in is_allow_more"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
     </div>
     <template #footer>
@@ -108,7 +128,6 @@ function reset() {
 
 /** 提交按钮 */
 function handleSave() {
-  console.log("-----------------", form.value);
   saveMulyipleCategory(form.value).then((res) => {
     if (res.code === 200) {
       proxy.$modal.msgSuccess("操作成功");

src/views/business/outsource/DialogSuppliers.vue

@@ -2,7 +2,7 @@
   <el-dialog
     title="添加外协商"
     v-model="visible"
-    width="600px"
+    width="800px"
     height="400px"
     @close="close"
     append-to-body

src/views/business/returnReceipt/DialogOutsourceDetails.vue

@@ -45,7 +45,7 @@
             " @click="handleShowFinishedDetail">+查看已完成明细</span>
 			</div>
 		</el-form>
-		<div><span style="color: red;">注：如果选择框为灰色，外协厂已填写收回单</span></div>
+		<div><span style="color: red;">注：如果选择框为灰色，外协厂已填写收回单，暂未提交！</span></div>
 		<el-table ref="dialogTable" :data="dataList" row-key="id" size="small" v-loading="loading" border height="370px"
 			@selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="40" align="center" :selectable="handleAllowSelected"/>

src/views/business/returnReceipt/DialogSuppliers.vue

@@ -1,5 +1,5 @@
 <template>
-	<el-dialog title="选择外协商" v-model="visible" width="600px" height="400px" @close="close" append-to-body draggable>
+	<el-dialog title="选择外协商" v-model="visible" width="800px" height="400px" @close="close" append-to-body draggable>
 		<el-form ref="dialogForm" class="master-container" :model="queryParams" :inline="true" style="align-items: center">
 			<div style="display: flex">
 				<el-form-item label="外协商名称：" prop="name">

src/views/business/returnReceipt/form.vue

@@ -391,24 +391,20 @@ function submitForm() {
         flag = false;
         proxy.$modal.msgError("收回明细不能为空");
       }
-      console.log(form.value.details.length);
       if (flag) {
         //赋值(因为收回明细是一个批次一条，所以后端传回来两个集合，一个页面显示，一个后端保存)
         handleSetAuditStatus();
-        console.log(form.value);
         if (confirmFlag) {
           proxy.$modal
             .confirm("存在填写确定数量为0的工序，确定要收回吗？")
             .then(function () {
               if (form.value.id != null) {
-                console.log(form.value);
                 updateReceipt(form.value).then((response) => {
                   proxy.$modal.msgSuccess("修改成功");
                   visible.value = false;
                   emit("handleSaveSuccess");
                 });
               } else {
-                console.log(form.value);
                 addReceipt(form.value).then((response) => {
                   proxy.$modal.msgSuccess("新增成功");
                   visible.value = false;